resolve: Introduce `RibKind::Block` #145065

petrochenkov · 2025-08-07T19:13:58Z

to avoid confusing module items, blocks with items, and blocks without items.

Addresses #143141 (comment) and #143141 (comment).

A couple of related cleanups are also added on top.

rustbot · 2025-08-07T19:14:03Z

rustbot has assigned @davidtwco.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

petrochenkov · 2025-08-07T19:16:53Z

compiler/rustc_resolve/src/late.rs

+    /// Behaves like `Normal`, but also partially like `Module` if the block contains items.
+    /// `Block(None)` must be always processed in the same way as `Block(Some(module))`
+    /// with empty `module`. The module can be `None` only because creation of some definitely
+    /// empty modules is skipped as an optimization.


If the optimization is removed, some diagnostics in UI tests still change, but due to other issues, like considering only a single immediate Module parent instead of walking the chain.

compiler/rustc_resolve/src/late/diagnostics.rs

davidtwco · 2025-08-13T17:12:08Z

@bors r+

bors · 2025-08-13T17:12:11Z

📌 Commit 7418fa9 has been approved by davidtwco

It is now in the queue for this repository.

resolve: Introduce `RibKind::Block` to avoid confusing module items, blocks with items, and blocks without items. Addresses rust-lang#143141 (comment) and rust-lang#143141 (comment). A couple of related cleanups are also added on top.

Rollup of 13 pull requests Successful merges: - #122661 (Change the desugaring of `assert!` for better error output) - #142372 (Improve `--remap-path-prefix` documentation) - #143075 (compiler: Allow `extern "interrupt" fn() -> !`) - #145005 (strip prefix of temporary file names when it exceeds filesystem name length limit) - #145065 (resolve: Introduce `RibKind::Block`) - #145120 (llvm: Accept new LLVM lifetime format) - #145189 (Weekly `cargo update`) - #145261 (Improve tracing in bootstrap) - #145266 (Reduce some queries around associated items) - #145299 (doc test: fix mpsc.rs try_send doc test) - #145331 (Make std use the edition 2024 prelude) - #145353 (bootstrap: Fix jemalloc 64K page support for aarch64 tools) - #145361 (Suppress wrapper suggestion when expected and actual ty are the same adt and the variant is unresolved) Failed merges: - #145324 (Rename and document `ONLY_HOSTS` in bootstrap) - #145372 (resolve: Miscellaneous cleanups) r? `@ghost` `@rustbot` modify labels: rollup

Zalathar · 2025-08-14T09:22:46Z

Investigating mysterious rollup failure: #145373 (comment)

@bors try jobs=i686-gnu-nopt-1

resolve: Introduce `RibKind::Block` try-job: i686-gnu-nopt-1

rust-bors · 2025-08-14T11:35:58Z

☀️ Try build successful (CI)
Build commit: e3f2d98 (e3f2d9828c7be614d884836207863ef2ab3edc29, parent: 2c1ac85679678dfe5cce7ea8037735b0349ceaf3)

to avoid confusing module items, blocks with items, and blocks without items.

…ent scope" help

petrochenkov · 2025-08-14T16:05:49Z

@bors r=davidtwco

bors · 2025-08-14T16:05:51Z

📌 Commit f369e06 has been approved by davidtwco

It is now in the queue for this repository.

Rollup of 9 pull requests Successful merges: - #118087 (Add Ref/RefMut try_map method) - #140794 (Add information about group a lint belongs to) - #144947 (Fix description of unsigned `checked_exact_div`) - #145005 (strip prefix of temporary file names when it exceeds filesystem name length limit) - #145233 (cfg_select: Support unbraced expressions) - #145243 (take attr style into account in diagnostics) - #145353 (bootstrap: Fix jemalloc 64K page support for aarch64 tools) - #145379 (bootstrap: Support passing `--timings` to cargo) - #145389 ([rustdoc] Revert "rustdoc search: prefer stable items in search results") Failed merges: - #144983 (Rehome 37 `tests/ui/issues/` tests to other subdirectories under `tests/ui/`) - #145065 (resolve: Introduce `RibKind::Block`) r? `@ghost` `@rustbot` modify labels: rollup

resolve: Introduce `RibKind::Block` to avoid confusing module items, blocks with items, and blocks without items. Addresses rust-lang#143141 (comment) and rust-lang#143141 (comment). A couple of related cleanups are also added on top.

Rollup of 22 pull requests Successful merges: - #118087 (Add Ref/RefMut try_map method) - #122661 (Change the desugaring of `assert!` for better error output) - #140740 (Add `-Zindirect-branch-cs-prefix`) - #142640 (Implement autodiff using intrinsics) - #143075 (compiler: Allow `extern "interrupt" fn() -> !`) - #144865 (Fix tail calls to `#[track_caller]` functions) - #144944 (E0793: Clarify that it applies to unions as well) - #144947 (Fix description of unsigned `checked_exact_div`) - #145004 (Couple of minor cleanups) - #145005 (strip prefix of temporary file names when it exceeds filesystem name length limit) - #145012 (Tail call diagnostics to include lifetime info) - #145065 (resolve: Introduce `RibKind::Block`) - #145120 (llvm: Accept new LLVM lifetime format) - #145189 (Weekly `cargo update`) - #145235 (Minor `[const]` tweaks) - #145275 (fix(compiler/rustc_codegen_llvm): apply `target-cpu` attribute) - #145322 (Resolve the prelude import in `build_reduced_graph`) - #145331 (Make std use the edition 2024 prelude) - #145369 (Do not ICE on private type in field of unresolved struct) - #145378 (Add `FnContext` in parser for diagnostic) - #145389 ([rustdoc] Revert "rustdoc search: prefer stable items in search results") - #145392 (coverage: Remove intermediate data structures from mapping creation) r? `@ghost` `@rustbot` modify labels: rollup

resolve: Introduce `RibKind::Block` to avoid confusing module items, blocks with items, and blocks without items. Addresses rust-lang#143141 (comment) and rust-lang#143141 (comment). A couple of related cleanups are also added on top.

Rollup of 21 pull requests Successful merges: - #118087 (Add Ref/RefMut try_map method) - #122661 (Change the desugaring of `assert!` for better error output) - #142640 (Implement autodiff using intrinsics) - #143075 (compiler: Allow `extern "interrupt" fn() -> !`) - #144865 (Fix tail calls to `#[track_caller]` functions) - #144944 (E0793: Clarify that it applies to unions as well) - #144947 (Fix description of unsigned `checked_exact_div`) - #145004 (Couple of minor cleanups) - #145005 (strip prefix of temporary file names when it exceeds filesystem name length limit) - #145012 (Tail call diagnostics to include lifetime info) - #145065 (resolve: Introduce `RibKind::Block`) - #145120 (llvm: Accept new LLVM lifetime format) - #145189 (Weekly `cargo update`) - #145235 (Minor `[const]` tweaks) - #145275 (fix(compiler/rustc_codegen_llvm): apply `target-cpu` attribute) - #145322 (Resolve the prelude import in `build_reduced_graph`) - #145331 (Make std use the edition 2024 prelude) - #145369 (Do not ICE on private type in field of unresolved struct) - #145378 (Add `FnContext` in parser for diagnostic) - #145389 ([rustdoc] Revert "rustdoc search: prefer stable items in search results") - #145392 (coverage: Remove intermediate data structures from mapping creation) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #145065 - petrochenkov:riblock, r=davidtwco resolve: Introduce `RibKind::Block` to avoid confusing module items, blocks with items, and blocks without items. Addresses #143141 (comment) and #143141 (comment). A couple of related cleanups are also added on top.

rustbot assigned davidtwco Aug 7, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Aug 7, 2025

petrochenkov commented Aug 7, 2025

View reviewed changes

This comment was marked as resolved.

Sign in to view

petrochenkov force-pushed the riblock branch from c88cbeb to 7461e53 Compare August 8, 2025 13:05

bvanjoi reviewed Aug 11, 2025

View reviewed changes

compiler/rustc_resolve/src/late/diagnostics.rs Show resolved Hide resolved

petrochenkov force-pushed the riblock branch from 7461e53 to 7418fa9 Compare August 11, 2025 16:22

davidtwco approved these changes Aug 13, 2025

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 13, 2025

Zalathar mentioned this pull request Aug 14, 2025

Rollup of 13 pull requests #145373

Closed

This comment has been minimized.

Sign in to view

rust-bors bot added a commit that referenced this pull request Aug 14, 2025

Auto merge of #145065 - petrochenkov:riblock, r=<try>

e3f2d98

resolve: Introduce `RibKind::Block` try-job: i686-gnu-nopt-1

GuillaumeGomez mentioned this pull request Aug 14, 2025

Rollup of 9 pull requests #145394

Closed

This comment was marked as resolved.

Sign in to view

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 14, 2025

petrochenkov added 4 commits August 14, 2025 18:50

resolve: Introduce RibKind::Block

68ebbae

to avoid confusing module items, blocks with items, and blocks without items.

resolve: Inline with_mod_rib

e6c96c1

resolve: Restructure resolve_ident_in_lexical_scope for better clarity

1652915

resolve: Add one more test case for "binding is available in a differ…

f369e06

…ent scope" help

petrochenkov force-pushed the riblock branch from 7418fa9 to f369e06 Compare August 14, 2025 16:05

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 14, 2025

Zalathar mentioned this pull request Aug 15, 2025

Rollup of 22 pull requests #145418

Closed

Zalathar mentioned this pull request Aug 15, 2025

Rollup of 21 pull requests #145423

Merged

bors merged commit ed5279b into rust-lang:master Aug 15, 2025
10 checks passed

rustbot added this to the 1.91.0 milestone Aug 15, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

resolve: Introduce `RibKind::Block` #145065

resolve: Introduce `RibKind::Block` #145065

petrochenkov commented Aug 7, 2025

Uh oh!

rustbot commented Aug 7, 2025

Uh oh!

petrochenkov Aug 7, 2025 •

edited

Loading

Uh oh!

This comment was marked as resolved.

Uh oh!

davidtwco commented Aug 13, 2025

Uh oh!

bors commented Aug 13, 2025

Uh oh!

Zalathar commented Aug 14, 2025

Uh oh!

This comment has been minimized.

rust-bors bot commented Aug 14, 2025

Uh oh!

This comment was marked as resolved.

petrochenkov commented Aug 14, 2025

Uh oh!

bors commented Aug 14, 2025

Uh oh!

Uh oh!

Uh oh!

resolve: Introduce RibKind::Block #145065

resolve: Introduce RibKind::Block #145065

Conversation

petrochenkov commented Aug 7, 2025

Uh oh!

rustbot commented Aug 7, 2025

Uh oh!

petrochenkov Aug 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

This comment was marked as resolved.

Uh oh!

davidtwco commented Aug 13, 2025

Uh oh!

bors commented Aug 13, 2025

Uh oh!

Zalathar commented Aug 14, 2025

Uh oh!

This comment has been minimized.

rust-bors bot commented Aug 14, 2025

Uh oh!

This comment was marked as resolved.

petrochenkov commented Aug 14, 2025

Uh oh!

bors commented Aug 14, 2025

Uh oh!

Uh oh!

Uh oh!

resolve: Introduce `RibKind::Block` #145065

resolve: Introduce `RibKind::Block` #145065

petrochenkov Aug 7, 2025 •

edited

Loading